Fix 64-bit build problem. Not allowed to movl between a

segment register and a memory location.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S
index 2898cef5d72d2eeb09cc7eb9bb064a7c03cd536d..621a6f9f5fe53712b301d27b52feb4da73ce8c6c 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/entry.S
@@ -751,10 +751,10 @@ ecrit:  /**** END OF CRITICAL REGION ****/
 # Hypervisor uses this for application faults while it executes.
 ENTRY(failsafe_callback)
        addq $0x10,%rsp /* skip rcx and r11 */  
-1:     movl (%rsp),%ds
-2:     movl 8(%rsp),%es
-3:     movl 16(%rsp),%fs
-4:     movl 24(%rsp),%gs
+1:     mov  (%rsp),%ds
+2:     mov  8(%rsp),%es
+3:     mov  16(%rsp),%fs
+4:     mov  24(%rsp),%gs
        addq $0x20,%rsp /* skip the above selectors */          
        SAVE_ALL
        jmp  error_exit